Cleaned up working directory

made sure to only contain fine grained data-structure