Cleaning up File Directory Layout