Dchallofjustice/Beginning cleanup and organizing