Update API structure. Add lintspaces checks. Update tests.