Reorganizing master; separating composer package, adding 5.3 compatibility