Refactoring directories

Re-sorted directories.
Added Clean up command.