Added better directory structure