Removed framework and unneeded classes. Moved part of framework files to includes/lib