renamed folders to use a better structure