Version 3

Renamed folders, added version 3