Combined class for acp into one file

Move other to temp folder...