Undid silly java-inspired directory structure