moving files, updating stuff, adding minium project requirements
fix merge conflicts