Remove unwanted spacing
Update file structure