minor tweaks
lots of new files and reorg
Update activity lifecycle, added custom view + reorg