Restructured project

![Alt text](http://imgur.com/7drHiqr.gif)