Fixed settings somewhat, directory restructure