File structure + cleaned syntax up a bit
Merge pull request #3 from recked/master

File structure + cleaned syntax up a bit