Refactored _assets dir and code