organize file structure a bit
move entities into their own area