Move files around to cleanup build
Added more proprietary stuff