Refactored assets directory