prepare to keep user data;
Refactored project structure;