Removed some using statements, added folders