Scanner + cleaning

- added user input scanner
- group the server files out for neatness