201403081500 - Rebuild package structure