changed the project to interfaces and moved appropriate files