Improved documentation & organization