Renamed classes for clarity and removed Framework search path
Changes to create new files and then delete them