Unnecessary folders removed