Changed the directory structure around to be a bit flatter and less redundant redundant