Cleaned up folders and getting rid of older/unused files