removed old files, moved stuff