Naming, cleanup and restructure (begin)