File structure and main
Updated client