Moved framework files into their own directory and fixed a bug in the view parser