Making structural changes to Top Shelf repo. Rewrite following best practices.