Added remaining files from main project