refactored... removed unecessary folders