Cleaned up
Final structure for submission