report + software architecture
cleanup
adding main structure