Application directory restructure, framework improvements, controller conversion complete