reorganized source files: added Controller and Infrastucture folders