Dev: Changed directory structure.