Structure change

Initial commit didn't work, trying diff folder structure