Moved framework code files into subdir