Fixed a silly directory structure issues