Structured the folders and added collision checking