allowing merge, committing deprocated code
file management classes
removing local file to allow for merge