Updated files
Cleaned up directories