Namepsaces renamed according to folders; Usings added