Changed structure of Controllers, Post Types and views