Refactor, modularization & cleanup. Add fleet parse