Code cleanup

- rearranged files
- welcome message added
- style cleanup