cleaning up directories

naming convetions edits and cleanign up directory for submission