Developer version upload: refactoring to fragments struture (in progress)