Cleaned up assets folder and updated code