Reorganise and add build/composer