Renamed files due to wp.me/p2xHM4-ma

Wrote a blog post over at wp.me/p2xHM4-ma and restructured my code so
far accordingly