Improve general project design by extracting classes