Cleaned up branch
Shuffled resources