Better directory structure for engine