Some fixed header and cpp files + controller