Layout created for multiple architectures, CMake files updated