Moved svg imports into their own file
Cleaned up files