Code and folders cleanup