Organization overhaul and added comments