major directory structure changes
trying to prevent duplicates
style changes