Cleanups and rearranging asset folder