fixed username loading, deprecation message, renamed few files