modified layout of the files a bit after talking with jirwin