Restructured directories. Bump version to 2.