Refactorize files and remove signup from main file