Cleaned up directories, finalized ns serial