folder restructure
Merge github.com:ecasilla/Moolah