Change directory structure for better conformance with the standards