Bit of refactoring and added folders