Refactored the directory structure. Still undecided on where to put the entity model though.