Removed unneeded directories + minor cleanup