Revert "Changed image directory to not be in static anymore"

This reverts commit 9590d8b143ed4a332472f9f18ec91f47e8aa615a.
Fixed order of commits