Added comments and cleaned up directories