reorganize file hierarchy, removed vs related files