Cleanup files, add needs views and controller methods