Updating comments
Decluttering main directory