moving sub files into src
added corect settings for somiler