Cleaned junk, moved source to root folder