Fix properties files and gen folder for easier importing