Changes file structure to comply with Google Best Practices.