Cleaned up, added some directory creation