Removed protocol files and merged /protocol into a single package