Moving to platform namespace. Removing unused files