refactoring project (and project controller and ability slightly)