Fixed some designs, also imported all files