Move assets folder back to it place. Fix Bugs.