Rearrange of Assets file system
Added comments for code readabilty