Changed the file structure.... again...