Tested
Remade structure
Fixed an error that didn't show
Merge pull request #1 from Crowdedlight/master

Merging to development