cleaned-up dir, added assets dir, more testing