reorder resources
Revert "reorder resources"

This reverts commit 552d1ac2e0854636136a0125cc38935b2d6a74c0.
changed guntfile rules and reorder files