removed some code and renamed files