Some minor changes and restructered the folders