Add version number, reorganise files for PSR-4.