Split files into MVC-ish structure, take 2