Adding refactored layout and new includes.
gonna try specifying the source