Changed naming, removed unnecessary files