Changed project structure to allow building for multiple platforms