Reorganized files
Ready for event handling and testing
Ready to test reading
Checking branch