Cleaning up public/private methods
A bunch of moving files around, started extracting template to external file.