rename some files, make user creation scheme, improve modularity