Sort out welcome file, refactoring and structure udpated